bitkeeper revision 1.736 (4036321eiozM1XWsrgEFsYgqQdvc8A)

memory.c, traps.c:
  Fix LDT demand-shadowing.

diff --git a/xen/arch/i386/traps.c b/xen/arch/i386/traps.c
index 58ace4707eed733f4d668e8432d77daa061ba761..3f8308347c5390f50d0c1f3938c5cdf27462f1f2 100644 (file)
--- a/xen/arch/i386/traps.c
+++ b/xen/arch/i386/traps.c
@@ -332,7 +332,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, long error_code)
          */
         off  = addr - LDT_VIRT_START;
         addr = p->mm.ldt_base + off;
-        if ( likely(map_ldt_shadow_page(off >> PAGE_SHIFT) == 0) )
+        if ( likely(map_ldt_shadow_page(off >> PAGE_SHIFT)) )
             return; /* successfully copied the mapping */
     }
 

diff --git a/xen/common/memory.c b/xen/common/memory.c
index 37f6ec3294f96728f5ddc4889718ef26f00866c2..e7caf7a60ba545bd17785a0de5fabddc9f18eca9 100644 (file)
--- a/xen/common/memory.c
+++ b/xen/common/memory.c
@@ -262,7 +262,7 @@ int alloc_segdesc_page(struct pfn_info *page)
 }
 
 
-/* Map shadow page at offset @off. Returns 0 on success. */
+/* Map shadow page at offset @off. */
 int map_ldt_shadow_page(unsigned int off)
 {
     struct task_struct *p = current;